Fix Xen target image dependencies.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/Makefile b/xen/Makefile
index dc381ab2e93949f884a2dd95cb77ae4c26b812c6..487cc0d85c49b9f55d4f1f465717d525f62bfa37 100644 (file)
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -55,12 +55,14 @@ $(TARGET): delete-unfresh-files
        [ -e include/asm ] || ln -sf asm-$(TARGET_ARCH) include/asm
        $(MAKE) -C arch/$(TARGET_ARCH) asm-offsets.s
        $(MAKE) include/asm-$(TARGET_ARCH)/asm-offsets.h
+ifneq ($(TARGET_ARCH),x86)
        $(MAKE) -C common
        $(MAKE) -C drivers
 ifeq ($(ACM_SECURITY),y)
        $(MAKE) -C acm
 endif
        $(MAKE) -C arch/$(TARGET_ARCH)
+endif
        $(MAKE) -C arch/$(TARGET_ARCH) $(TARGET)
 
 # drivers/char/console.o contains static banner/compile info. Blow it away.

diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
index 429cec1b69d6b9ff3a1d7ba3b97a797926aed295..014e5f31d808e0ffbc9f84c6970e9196f429c980 100644 (file)
--- a/xen/arch/x86/Makefile
+++ b/xen/arch/x86/Makefile
@@ -55,7 +55,7 @@ $(TARGET): $(TARGET)-syms boot/mkelf32
        ./boot/mkelf32 $(TARGET)-syms $(TARGET) 0x100000 \
        `$(NM) $(TARGET)-syms | sort | tail -n 1 | sed -e 's/^\([^ ]*\).*/0x\1/'`
 
-$(TARGET)-syms: boot/$(TARGET_SUBARCH).o xen.lds
+$(TARGET)-syms: boot/$(TARGET_SUBARCH).o $(ALL_OBJS) xen.lds
        $(LD) $(LDFLAGS) -T xen.lds -N \
            boot/$(TARGET_SUBARCH).o $(ALL_OBJS) -o $@
        $(NM) -n $@ | $(BASEDIR)/tools/symbols >$(BASEDIR)/xen-syms.S